before pull
Merge remote-tracking branch 'origin/master'
some small UI fixes
Merge remote-tracking branch 'origin/master'