public marks

PUBLIC MARKS from asteroza with tags layout & 2.0