Improve orders interface