Small clean up

-Rearrange a few options and tabs
-Clean up some strings
-Move Show 4G icon option from Wireless Settings to Statusbar -> General tab