Overhauling menus a bit; making them OO.