LUN-1022 : Add flexible header and color picker field