improve the layout and navbar