added what I think will be the last round of ui tweaks