dashboard improved & bugs fixed