Layout / view restructuring.