Add empty view
Merge branch 'emptyspaceview'