partial rewrite of widget section