Fixed cooluri
Fixed JS Error
Merge branch 'bissfest' of github.com:noelboss/nbobase into bissfest