Some fixes & improvements of dashboard mode