Replacing GridView's by Point's
Small clean up
Moving models from View to Model
Bug fixes