More on boarding work

Cleaning up the design