More minor menu tweaking