Refactor sidevew.
Merge branch 'sideview' into dev