Categories layouts and buttons
merging Kien's changes with button functionality
Merge branch 'master' into Life-Goals-Activity