Changed to view layout and view data