Merged dashboard fix