Some markup updates