UI clean up and adding in translatable bits. #191