Fixed some strings, added layout padding, removed layouts that are no
longer used, fixed most of th checkstyle warnings
Merge pull request #368 from espeo196/master

Tweaked some stuff