added what I think will be last round of ui tweaks