Page cleanup
cleanup + many updates