Improve initial create / save experience