Refactor; Fix dashboard link