Improved markup
Fixed missing references in and.js