Fixes #15, #20 - Two Column Menus and Menu Cleanup

The menu stuff still has a lot of work left to be done, but it works for our current purposes.