#106436 Improvements to performance and readded missing fuctionality suc...

...h as popups