New Layout

New layout and color scheme