Modified UI proposal
Merge upstream/master
Merge pull request #13 from miriammariety/master

Modified UI