improve menu
improve layout