Delete button visible to admins and some bug fixing