Added empty views
refactor