Move more name options link in more places

Also get rid of extraneous form-group classes