Refactored history view