Fix layer control, fix missing toggle image