Modals

See merge request !7 (merged).