Get rid of faked CGroupBox and reimplement it in the proper CButton BS_GROUPBOX style. Get rid of CBitmapButton--unused. Adjust geometry calculations to properly include widget extents.