organizing panel html better
need to fix everything