Fixed markup issues and cleaned up content