Move menu to layout, organize css