@update - touch up code
@update - add question view button