Re-factored view
Merge pull request #1 from nandagv/patch-1

Re-factored view