fix calendar UI + Added instance method for soft delete + modified views +  before touching controllers shity code2