Moved content from base to main
Merge views