Menu class and some clean up