Refactor and renamed both menus (main, details)