finished making the view and bug checking
merged with the master