updated with ui-navigation