Several markup and style fixes