Separating panel code
naming cleanup