Added delivery reminder
Added supervision reminder and code refactoring