Added widgets to screens to flesh them out a bit