modified change_theme layout to fix an issue