Refactor data, upgrade styles