Refactored stats-widgets