Network additions, ordering fixes, lots of UI changes