making property name better conform to naming conventions
adding buttons and counts components