Work on the UI
Merge branch 'master' of https://github.com/Manevolent/EggCrack