Fix layout, css and menu