[GF] Update to button placement