Merge pull request #1 from lizmcarney/master

UI complete!