fixed count
add loading  message
Merge branch 'fix_ui'
Merge remote-tracking branch 'origin/master'