lots more ui tweaks and such