Added AppLayout components
merge