Layout cleanup; Start with LocationActivity