grid applied to home.html
resolved merge issues