Issue-516 and Issue - 526
changes to the panel