rearranged panels and removed some commented out text