Some UI bug fixes, some things are annoying to implement with current UI
scheme