Minor modifications + fixed problem with hue bar in demo
Refactoring