Continued working on new Menu Layout