Fixed color of border
Comments and todos