What changes should I make to this layout?