Finally fixed Items view