Added nav controller to settings page, other misc