Categories layouts and buttons
merging Kien's changes with button functionality