public marks

PUBLIC MARKS from naudjf with tags xhtml & layout