* Minor changes for added consistency w. radio * Added translation for #2397 * Additional tweaks * Additional tweaks