Color variables and layout fix