More comments and consolidated some code in MenuPart.