finished panel

reorganized too