Revert "Revert "Final CSS changes""

This reverts commit acf153db680b0c6b7e7ec5bdfda61c59d68da915.