Revert "Revert "Several CSS fixes""

This reverts commit 7ab183b3fc4a6379ad73f9f975b34de206c9c817.