fixed merge conflict
refactored user_interface.js
fixed merge conflict in layout.erb with js files