cleaned up routes, added 2 tag routes

rails automatically generates helper paths, only use :as => "helper_path_name" if it's different from the route