changed layout
fixed merge conflicts