finished fixing borders padding and colors