Consistent formatting of options.
Correctly send credentials on reconnection and add service browser html.
whitespace