-merged updated MainFrame from longdo
-fixed ButtonPanel class name