Add padding to modals. Switch order of imports