iOS bug fixes
Merge pull request #942 from stowellm/goat

iOS bug fixes
Merge remote-tracking branch 'origin/bd859' into bd859
menu is now working correctly