Converted menus to use GUILayout

Other minor fixes.