Update base components and prepare layout