fixing more css bugs
Merge origin/master