Some changes plus proposal to add question form

Needs a cancel probably if one changes mind but we have to discuss some
desing choices here.