Added function for "No data" display and viz order reorganization
Removed console logs