Fixed layout problems and colors