Update UI, fix save system (again)