removed grid and converted demo layouts to new bloc systen