some adjustments to new design