SPLP: stop special treatment for firstPanel

it still seems to be Spaghetti code...hmm...