refactor some buttons and links, remove unused debugging puts