More markup and cursor fixes