New colors & layout improvements