Reworked the layout to compact things and remove a number of arms.