Css jerking
Merge commit '7f10108fa5a8dc5f1bb5990af20e0f7f316229f6'