Minor check-in with some layout cleanup