Nice solution! Really liked it. If you want to check the new portal implementation, it is already merged into 3.4 branch, and the details can be checked in this PR.
