updated layout and colors