Some updates and fixes on view side