Added toolbar view. Changed a few things in VC around...