Much needed design adjustments