Work on the AddServer screen and small improvements for ReportingAs screen