Merge pull request #18 from halitanildonmez/mhotan

Refactored views.