Added new screens, moved nav off