refactor the panels , 
and added dynamic properties