Revert "layout update"

This reverts commit d6fb3d364a1965806c41d4ed5d74939da4fdea6f.