LMSEE-31 - Added some new changes to improve the event handling and text options