Fixing and updating and tabbing or spacing issues