update to add display of results
merging layout branch to master