begginging of fix for labels and buttons editable
merge