Minor code style tweaks
Get qvis working again. Add layer_guess