Nav buttons fix