Added gauges and change UI