Polish GUI update (based on BZR5337 source)