Revert "Further CSS fixes"

This reverts commit c6d50b2d440c82700a13b63b395fcec71b060ec3.