Fixed the watch file
Cleaned up grid styles
Making update for component  structure
Started the button skeleton setup
Fixed the include in the buttons file