Merge "Improve widget getters"