Modals revisited

Modals are more flat now.