Fixed some small issues with the modals