Fix delete layout as needed. Other tidyup.