#603 When changing layout, automatically changing options edit and delete buttons;