Rework top-area and navbar