Placeholder button and text values for API10.
Removed unused menu items
Merge remote-tracking branch 'origin/master'