did some jquery janx
Merge fix