Made progress on navigation bar