added basi layout
merged conflict