clean up JSPs
try to remove dirty JSPs..
remove dirty JSPs
fix for paging
fix tests
update headers