fixup UI a bit