LPS-34469 Adds some UI fixes and strings