Try modal dialog instead of separate layout