Fixed border and link

BAM