EST-408b: Moved change buttons to the block which it relates to