fixing mainview branch
Merge pull request #3 from nguidry/mainview

ready to merge MVP mainview