Update layout + adjust colors