Updated Navigation
UI Tweeks