Fix radio buttons and cleanup