Controller cleanup
Fixed text fading
Small changes to city screen