More space & size adjustments