Combined the blocks with scaffold into one HTML file, design/CSS is next