Refactor of beers widget