Border is now drawn on track item instead of around it