Cherry picking t925

t925 - Theming modal / fix for broken page after modal opens