make dashboard more friendly
fix merge conflict