Update layout, improve menu structure