UI tweaks including renaming components