Improved some markup