Merge "Fixed a bug on view and editor screens"