Refactor code & integrated new menu layout.