Quick-entry work, added gift features