Some small GUI changes

Small fixes so I can move on next week.