Add encryption mode to AP heading on Adv page, amend GW label on Status page