DSSSM-467 #time 1h Relocated the navigation controls