Add grunt and update theme/ layout
Update theme