Layout change and clean up