fix markup and some styles