Cleanup, hacked search bar into PUC, resource servlet added