Fix navigation on button issue