Update with layout fixes from HW6