move locations out of model and into view