layout: improve layout, fixing menu issue;