UI fixups and beautification