some frontend adjusts
some frontend adjusts