Commit before re-doing current code to handle confirm dialog
Touched up code, looks nicer all cases covered
Pre merge commit
Merge branch 'hotifx'