Some color and layout mods