deadline status added
small refactoring on different views
small refactoring on different views