views added, little design changes