Status Screen fixes