Dashboard: Cleaned up drag and drop code