Fixed the edit/delete buttons, not functional yet