Add utility class
Remove tab directive