improve layout and navbar