start of layout
fixed merge conflicts