Ensure that modal outlet is always cleared
Added additional customisation options to modal dialog