More edits on views & some clean up