started work on extending the view
merged other changes