Design improvements 1.0