Fixed js bug + included minification and concatenation