MInor fixes in styles after conflict