Changed rendering of panels to more generic one