Menu page finished and bug fixes