a few changes to the view, still debugging basically