Refactoring

Merge index and show methods with an if statement checking whether or not ids have been provided in the url (routes have been updated accordingly)