Using ui-router

Figured out ui-router and added a few more features