Small refactor on dashboard and fees