Cleaning up screen nav specs

Also consolidated where we're checking for main_controller.