Refactor to use menu class

This allows us flexibility in our software design
Make changes later easier.