Better layout and colors