Code cleanup, Fixed messy windows 7 gui