Inprogress change to EditActionSet layout