Trump overhauls income tax proposal