Cleaned up views to all use the same navigation bar