updated layout
merged files