LPS-42281 Visual and usability fixes