Modified view files to be more precise