Finished view generation | Added more testing templates