Improve network widgets