Revised the ModelViewer to assignment 2

Revised the ModelViewer to assignment 2, too many changes..