Refactory Dashboard