Clean more HTML and reach more UI consistency