Making some more changes to frontend to support worksheets