Make local/remote save work + improve UI