Bugfix  for location of buttons