Spaces rework, pretty happy with this design