Alignment fixes and changed fonts for Tokyo