Add wifi info. Some layout changes.