added location names and clear screen