removed container from layout
fixed merge conflict