Sunday morning updates

Started updating view templates, added citypick page