variable renaming
merge Wifi related UI