fix css, convention mapping edit
merge