Some code cleanup. In addition, the toolbar was adapted for the new spreadsheet view referenced by #121