Fixes to Modal styling