Organizing partials & adding more