updated UI and added counting features