add quick view
Bug fixes and improvements