merge front-end
navbar margin fix