Removed deprecated function and try to fix unusual tab display