Removing non-needed var, moving css & JS at top of the function for more readability
Merge remote-tracking branch 'origin/master'