Some cleanup, font changes and config changes