Commit of re-factor for menu view