some changes in main
added methods to view and its subclasses
resolved conflicts