Fixed another edged and some failed layout reversions