Some small fixes
Updated Dashboard controller