UI changes
Fixed bugs related to dealing with the end of data