Fix small bugs in service discovery, update wifi select look to material