included ui.js, changed order