LPS-38253

Please review, specially the UX changes in the last commit