Updated for right navigation