Bug Fix: some scenarios where buttons not displaying