restructured modal controller
Merge branch 'master' of https://github.com/nagey/ouiff