Bugfix: Use proper CSS syntax
Minor import order change
Attempt to fix issue #3235
UNDO