Fix #99 and partially fix #103

New conv button is removed, this can be removed :)