change layout colors
resolve merge confli..