ADB cleanup, various UX improvements

Width/Height selectable next major update