Initial commit of new layout
Merge github.com:nHansberry/SRSLY_choc