Add template function for buttons wrapper
Refactored itemsToDisplay getter and setter
Rebuild current version after refactoring