moved trd to new view controller, misc fixes