Refactor blocks

Pull answer and updateAnswer up to block scope. This fixes the radio button double click issue