Code cleanup.
Gauges placement improved.