Added panel handling