Some changes to finlize

1. Dashboard fixes
2. Errors fixes