Bugfix + font adjustment