Layout changes (and some linting in ui.js)