LPS-32688 Fix compile
LPS-32677 Fix inconsistencies in display
LPS-32677 Lang keys