Added more UI
UX again
Merge branch 'master' of https://github.com/dragoon20/IF3038-2013