Code with new layout and colors