Cleaned up numerous markup issues