fixed some UI
Merge branch 'master' of https://github.com/razfar/chores
fixed merge conflicts