[#30]: Some updates on view