layout fix
#94 aggregation tested better and fixed