Refactoring + hscrollbar bindings