Move button hiding to later