more layout work, colors