MOB-163

CSS fixes & merge with master.