Menu modifications and bug fixes