Dashboard navigation improve