Feature/multiple views