Generify the rendering somewhat so new forms can be added easily. Issue: #487