redefined borders and styling.
fixed conflicts.