Fix navtab
Fix ui