Corrected dataset and fixed color and border issue