Show weights and averages, clean up and fix UI