Improved dialog look

Partly addresses review comments