Remove Edit link, change a few function names