Reworked db tree and pop up menu