deadline can now be saved and UI improvement