a bit of cleanup in the gui code
more style fixes