removal of invalid int
removal of duplicate library
update of files
Also post calculated values.
layout change
Merge branch 'ruudvanderweijde-master'