Registration and UI fixups