Improve menu layout and fix others things
Improve menu layout and fix others things