Remastered the menu class.
It should be more object orientated now.