CURRIKI-6214

Various CSS fixes