fix some bugs and adjust the axis location