Refactor analyze panel