Roy|000|Committing patch sent by Megha for UI Fix