Refactor info widget