Improved modals, and added progress spinners