Fix moving buttons