clean up and first attempt to moving panels