Added the main layouts and fix view not loading issue