Fix a few issues and add option to change font size