Removed some construction lines, moved parts to more compact layout, to ease flow from bugfixing to cutting