Layout modified and hardcoded strings removed.