tab and navigation improvements

Change-Id: I4ae07c2cd055ab112c69c1b1a20056caf3eaf0a0