General fixes after reviewing template after widget updates