Feature/modal improvements