Added edit and delete buttons, no functionality yet. Ready to merge with Tobias.