removed some unneeded layout sections
fixed merge conflict