Split controller code into multiple controllers, added delete button