Added edit Entry link
Fixed combined time computation, again, nobody cares
Refactoring