changed layout and colors