updated layout
Merge branch 'master' into KMSEdits
UI updates
Merge pull request #27 from FlappyMappy/KMSEdits

Kms edits