Cleanup
Introduce limited fluidity to design