Made a few more layout and font changes