Cosmetic Changes and HTML clean-up