WIP save to network - fixed UI