some ugly colors and paddings changed