add temporary images; refactor controllers