FIx issue with default border overlpaing the colored border.