Added missing strings in each UI and clean up