Fixing error on duplicated selectors (still need to figure out the issue with onclick though)
Merge remote-tracking branch 'upstream/master'