#19758 Fixes, CSS improvements