Refactored dashboard widgets