reverted dailog builder, fixed setup