Sort stages by order, and add padding to range

Minor updates to visual style to enable the new guides to be pushed to production.