Changed a bit of the table layout & colors