Cosmetic change in toolbar and playboard
Handle storage of current state in datastore