Minor bug fixes and menu state
Menu items