Remove duplicated code using .modalController abscraction
Merge pull request #1023 from Nevtep/controller-abstraction

Remove duplicated code using .modalController abstraction