add message no_data and improved some elements