page layouts
conflicts fixed
pull from my branch
fixed conflicts