Made the UI better
Merge branch 'master' of https://github.com/lawrencelm/SmartBox