refactoring cluster and xones in dashboard controller