Minor go button optimization