Adjust font size and other small fixes