Redesign the whole thing for compactness sakes!

It was very wide before