Minor layout cleanup