Replaced unnecessary JFrames with JPanels

Copied JFrame code into JPanels and deleted old JFrames. Made slight
adjustments to button placement to fit them into the panels. Removed
redundant scrollbar from SelectActivityMatrix.
Merge pull request #144 from graemesmth/master

Replaced unnecessary JFrames with JPanels