Updating the uncover button & logic a bit