Revert "Normal navigation (instead of touch), nav after layer controls."

This reverts commit d76e551c6fdf407aa7d0ea24dbcce1c12c08f0ce.