layout improved
factored color handling into supertype, layout improvements