Fix bugs in modals ui
Merge branch 'bugfix/modals' into peter