split to multiple views and improvements