Refactoring. Moved Streetviw out of PopUp logic. Moved all non popup or non-streetview logic in location wizard. Made separate classes for each location wizard step