Merge pull request #4 from jhaybie/master

UI Elements