Pushed to live
Improved UI for modals