new views

lots of changes