ticket: 6 Views fixed