worked on view and actions
merged conflicts