update TODO; fix url format in views