some fix and change layout colors