Refactored partial into presenter