CON-1709 | mostly css fixes