New version to deal with issues surround disappearing buttons.