fixed parts that were cut off on 3.5 inch screens
Merge pull request #58 from kraftery/kieran2

fixed parts that were cut off on 3.5 inch screens
Merge pull request #59 from kraftery/master

happy easter everyone
Merge pull request #60 from kraftery/NewNewDavid

Merge pull request #59 from kraftery/master
fixed conflicts