Fixed some gui elements

Back again to do some quick patches before the game signing / official
gold master release. Most of the GUI stuff is for android.