Slight Tweaks to ordering

See notes on task we need to re-add