Merging functional changes for v1.0 release

Site design will remain unchanged for now.