worked on view a bit more