added new layout
merging