[BUGFIX] Fixes some css edge cases