Updated button navigation