Edited UI and registration beans