Refactoring

All menu building now done using a utility class.