More layout touchups