Menu reorganization and re-style