fixed layout errors from chipola  merge