Fixed CSS bug
Merge origin/master