Tightened up spacing and tabs