Update UI logic
Merge branch 'ui' of https://github.com/vodkasoft/ChallengeMe into ui