Added panels and form controls