comment off the part related to logic, focus on UI appearance first
Merge remote-tracking branch 'origin/master'