Restructured in preparation for removal of compute button.
Computebutton now successfully depricated.