Fixed unparceling error, added new layout
changed formatting