Remove additional tab space
WIP