fixing links. Add TBD. Fix cancel button