various ui tweaks and chages

@lauraxt r?