Some organization
Added delete button
Renamed URLs and routes