Fix grid layout and navbar