Undo CHSSC specific changes: Revert "Clean up layout and fix names"

This reverts commit d0bcd6810ba72668d97d5b42a4951a20a0f4a2dd.
Undo CHSSC specific changes
Merge branch 'cleanup'