graaaande refactor nas views :)