More specific names for radio inputs
Temporary fix for notes

Also, more specific radio input names.