added new views and more fixes