Revamp UI 1
Merge branch 'master' of https://github.com/jasongoh1987/Hackathon