Changed view file structure