Add radio buttons and ok/cancel button to dialog

Add radio buttons and ok/cancel button to dialog
Fix up label alignment on meters