Added deadline support, reworked UI