Shashank | Fixed out of memory issue and text overflow issue