Fix spec order for emails
Fix specs and views for new layouts