updated layout, removed foldings etc