Changed layout and colors