some style update and spacing issue