Starting to get main layout in place