Minor slider fix, some logic moved to controller, other fixes. #ch-34 work 2h
Merge remote-tracking branch 'origin/master'