made changes for more valid markup