more changes and new views file