Added Border and Colors