Aleksxor/chore/53525785 widget refactor