Also simplified bottom navbar layout and removed inline style