Merge pull request #16 from CTSATLAS/chipola-new-fix

Chipola new fix
fixed layout errors from chipola  merge
Merge pull request #17 from CTSATLAS/shawn_sandy

Shawn sandy