add keyboard shortcuts for record and track name first
fix merge conflicts