Updated the font to 24. Removed one TODO