Renamed some partials and controller actions to be more clear