Added design for modals - need cleanup