and more layout improvements.