Added usability traits to right nav
Merge conflict with remote change