modal dialog frontend basics complete
fixed merge conflicts