Update admin navigation context
Some UI Fixes