long form and short form final markup additions
long form, short form css additions