Refactored html using partials