Fixing issue with some global events not firing
Fixing folder ui customization issue