New layout cleanup and fixes