Fix failing specs
Make screens look like the new mockups