updated routing and views
resolve conflicts'