Minor changes to toolbar format
Changes to gmail get and set contents methods