Some improvements for both markup and contents