adjust grid, add media querie and fix bug in fluid layout