Started fixing up Connection settings page