Cleaned up menus, working out a simpler way to do dynamic sizing.