Improved model view and serilization to be more specific
Merge branch 'master' of https://github.com/jixuan90/hackathonPrototype