Fixed some menus and added a null check in my comments