cleaned up js a bit
Merge conflict