fix some screens and panels