Merge pull request #1 from lizmcarney/master

UI complete!
Merge pull request #2 from lizmcarney/HEAD

Merge pull request #1 from lizmcarney/master