fixed the overwrite bug and border-right