Next Generation Li-S and Li-O2 Batteries based on Electrode and Electrolyte Design