Various bugfixes and delete buttons