merge dashboard and machines views into one view (Machines)