Updated Layout, Added logic to add care group, added autocomplete for searning name