More work on dialog implementation
Start using dialog helper