Changed to a menu bar

This needs a fair amount of cleaning up, but just wanted to make sure I'm on the right track.