redid the layouts in underscore