[GF] Modified buttons and button width calculations