Separate out the server and client token fields; move Rollbar to within the Settings menu.