refactoring and fixed categories button representation