Changing layout, fixing packaging errors