Updated CSS & Borders