Some tweaks
Change order of add dialog buttons