Fixed more tabs