TREFF fix some of the small stuff ruined during restyle