Report Widget + some refac