Properly handle no-deadline contracts
sorting by deadline, still working on spacing