Refactored
Changed up angularjs again
partials