split views and misc refucktoring