Fix for edit-buttons