Added contact view, and some other fixes