Merge update functions and widget classes into screen classes.

This should make the code slightly easier to read and will enable me to
do some other nifty things later on.