Aggregate login rout and view

Please merge my work to master branch