Re-ordered events menu items, cleaned up formatting