Added menu and bug fixes