Adding some state logic, font swap