name change
added lines, better class hierarchy for view objects