fixing up the template with search capabilities, and test connection tests
fixing up the rest of the template
fixing up the rest of the template