More minor updates to fix display issues on windows 7