Modified the color and table boredered code so that it is better indented