refactor new-styles and fix borders