some design adjustments