modal improvements