Move non-layout properties out of layout css