Issues - with UI fixed - Router-modalwindow