New version to deal with issues surrounding disappearing buttons.