Improved Routing, implemented angularJS with bootstrap