Updated design refinements