QoL views improvements