More tab removal and style consistency