readded the conversion buttons and fixed the tooltips
Merge branch 'capright' into testing