Show Edit and Delete options on more pages
Clean up the controller