Modified things to allow us to put it on iPad
Merge remote-tracking branch 'origin/development' into development
Couple of minor style changes.