Issue 11 - Custom modal dialog