Fix up some design
Fix some more design