moar layout changes