Some more GUI work

It's been a while...
Widget work
Widget work