Add layout and color