Some more changes to reporting ui