More UI changes

Fixed the red / rainbow / OCD thing and duplicated the new layout to
the other view