Polish GUI update (based on BZR5299 source)