fix broken randomly disappearing buttons
merging