[gh-pages] Refactored some code to work with two-way mv binding