Fixed infinite loop
Refactoring: Deleted view struct