More js cleanup
Using Navigation.action for main action definition