Demo merge
Total Score
UI brush up