Added partials, optimized controller
Added partials, optimized controller