polish new version. fixed margin bug