Fix NPM dependencies
Fix bower dependencies
Change control design