Major tweaks to front-end orders