Add selection wrapper and toolbar localization