Basically added 1.2 panel, with a bit of cleanup