css / markup cleanup