Issue 5 - Custom modal dialog