Add buffer and window number segments

Neither are shown by default.