Refactored html into partial