little refacto of interface.js and switch order of rebase state on DOM