Fix/improve on demand dialog layout