Adapted to my linkings and added color coded borders