Fixed several bugs on navset2 date and cleaned some codes