Added jQuery and statics
Cleanup
Merge