Dialog mostly working