LPS-35170

Hey Eduardo. I asked Patrick to close his pull request since it wasnt as robust as mine. Also I think that i have a good idea to improve this problem with the tree structure navigation on the left. I'll work on it one day after all the aui2 bugs are squished