Show messages when there are no record to display

Show messages when there are no record to display and other minor fixes