Refactored code
Added new partials