questions design and other tweaks
merge conflict fixes