Split general and proxy settings. Added some help text (not currently displayed). Dialog sizing needs to be addressed