New modals, style improvements