* Adjustments in Layout and Icons