updated view folder with jay's changes