More layout cleanup