fixing ui stuff
Merge branch 'master' into cards