Update from AgentSmith
Adding Basic User Navigation
Update for YD
Test