smallbugfixes and added Edit Button