Yet another update to fix tab spacing issue