#20 changes corrected avoiding css changes