Improved on demand restricting dialog layout