Added all tabs and fixed menu