Switched to ui-router and design changes