Modal stuff

Little improvements for DoSomething/dosomething#1015.