Fix the naming of pushed apps. No more duplicate entries.
Even more z-order for context menu