Refactor view OneToOne annotation, fix bugs